Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 10 Jan 2012 06:21:19 +0000 (22:21 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 10 Jan 2012 06:21:19 +0000 (22:21 -0800)

Trivial merge